Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.17: geyser: allow custom name in config file (backport of #33550) #34669

Merged
merged 3 commits into from
Jan 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2024

This is an automatic backport of pull request #33550 done by Mergify.
Cherry-pick of c82fc6c has failed:

On branch mergify/bp/v1.17/pr-33550
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit c82fc6c98e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   geyser-plugin-manager/src/geyser_plugin_manager.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Allow loading the plugin name from the json config file as opposed to use plugin.name which is called before config file is passed to it. Allowing different plugins using the same executable to use different names.

(cherry picked from commit c82fc6c)

# Conflicts:
#	geyser-plugin-manager/src/geyser_plugin_manager.rs
@mergify mergify bot added the conflicts label Jan 5, 2024
@willhickey
Copy link
Contributor

We can't backport this to beta at this point in the stabilization cycle...

The master version of this has run on canaries but not on a whole cluster. Since beta will be promoted to stable soon, backporting this to beta will ship it to mainnet-beta very quickly with minimal time to test on testnet.

@fanatid
Copy link
Contributor

fanatid commented Jan 6, 2024

branch with fix: https://github.com/fanatid/solana/tree/pr-33550

Copy link

codecov bot commented Jan 20, 2024

Codecov Report

Attention: 10 lines in your changes are missing coverage. Please review.

Comparison is base (407dfba) 81.6% compared to head (bccfc96) 81.7%.
Report is 2 commits behind head on v1.17.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34669   +/-   ##
=======================================
  Coverage    81.6%    81.7%           
=======================================
  Files         805      805           
  Lines      218806   218825   +19     
=======================================
+ Hits       178747   178801   +54     
+ Misses      40059    40024   -35     

@lijunwangs lijunwangs self-requested a review January 20, 2024 03:01
@lijunwangs
Copy link
Contributor

This change is very low risk -- only loading the plugin name from the config file if set, otherwise the logic should behaves as before. Okay to backport.

@lijunwangs lijunwangs requested a review from willhickey January 20, 2024 03:05
@lijunwangs lijunwangs merged commit 27a4380 into v1.17 Jan 20, 2024
33 checks passed
@lijunwangs lijunwangs deleted the mergify/bp/v1.17/pr-33550 branch January 20, 2024 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants